classes.js cleanup