Rework profiles and clean up