Remove redundant or unused code