Do we also want to remove underscores as this does?