Remove un-needed Clazz all over the place