remove the __ rampant throughtout the code base