Remove a bunch of debug code. Now is test branch only