removed all the old stuff