remove unnecessary def from variables