Remove old classes(post refactor)