Removed last references to underscore