Clean and merge manual pre-odl