Additional cleanup and 1.2 goals.