Comment clean-up
Fix assigning statuses, and don't block removing statuses