US12.js cleaned up