Remove method-in-progress that didn't need to be committed, removed -recreateImageBuffers calls in places where it's not necessary.