added cleanup.js back in