Clean up 2.x branch