Got rid of old unused code, ready for profile image migration