Remove guardian references (old)