removed and moved some old stuff