clean up :use and :require
update to incanter