Minor clean up, removed debugging files