Remove old and unused classes