remove use of underscore where not allowed