got rid of class stuff