code cleanup 1.2.7.2