Remove duplicated 'none' and minor adjusts

@paglias please add this when you merge [habitrpg-shared #119](https://github.com/HabitRPG/habitrpg-shared/pull/119)