Getting --list-profiles to work, random cleanup