Moved some old stuff out of the way