Cleaned up some debugging code