Remove dead commented code
Dry up the code some more
Remove some dead code
Use cocoapods