OP-706 Removed some obsolete includes and methods.