Remove superfluous defvars