Removed most NSLogs and a superfluous method