More cleanups from deletion of SProfile