cleaning
 merged and cleaning