Cleanup of the profiles, separated estimation stuff from control stuff