Updated cleanup.js