removed extra redefinitions