Some more cleaning up before testing