removed some old stuff that was not needed anymore