Remove the classes and call directly