Added methods for removing classes