Removing attaching data to classes directly so there are no errors if the classes are not defined