Updated AbstractDrawElement, onVar methods removeVars