US5.js cleaned up