Added ability to delete class