fix up some paths and uneeded imports