Amend remove classes