bfops merge cleanup