core cleanup: move out ocs2007 code