deleting some garbage and organizing dependencies