Remove 'other' categories
Clean up updateprofile snippet
Remove obsolete class and map files