clean stuff up, fix dependency tracker