Fix redundant self II