4.2 release preparations

code cleanup