Cleaning up before 3.4 release