Clear up andor references