3.5-3.6 update cleanup