Remove redundant code
Continued cleanup