Removing unused classes for now