US6.js cleaned up