Removal of classes also working