clean up in LBM class
fix merge conflicts