Removed placeholder classes, which should not be used anyway