Cleanup of deleted classes