Remove redundant code Public Feelings