clean up of classes.js