2.0.0 code cleanup