or nearly so. Cleaning up unused modules. + fixing the view for profiles/profile types