common.js cleanup