V1.2.1, bit more cleanup