Cleaned up some debugging