Remove redundant self