Some code cleanup: removed NSLogs and dead methods