Remove redundant return and self statements