[CLEANUP] Removing unused classes and dependencies