US11.js cleaned up