Some more cleaning up before Testing begins