Cleanup integration of core files modified by ORPL