Clean Up on source code using new profiles