Cleanup of post 3.2 code.