able to refactor and shorten class removal clauses
refactor