US10.js cleaned up