Remove redundent self in location model