Cleanup after changing underscore