US7 cleaned up