Cleanups, removing some debugging info, etc