crud cleanup and fix port
crud cleanup and fix port

GeoffWilliams/r_profile,declarativesystems/r_profile,GeoffWilliams/r_profile,declarativesystems/r_profile,declarativesystems/r_profile,declarativesystems/r_profile,GeoffWilliams/r_profile