3.6.0 [RC6] - cleaning code