Code cleaning in Recommend/MRR