removing old code, fixing packaging conflicts