Removing classes for now