Remove awful underscore