HabitsHelper cleanup