2.x branch cleanups