Remove the classes, and use only functions