Removed simple classes