Enhance LOEP integration. Clean some unused model