Removing some debugging and allowing for manual UID assignment