Update to remove debug as well as redundant underscore inclusion