Update to remove debug messages