Cleanup of Underscore