Cleanup some debugging and other derp