Removed dummy classes