removed old stuff that we were not using
perrys changes