cleanup redefinitions