Refactor - removed unused classes