Refactor, removed unused classes