Removed all the old stuff