cleanup and adding noconflict