Cleanup and BO record modification