Got rid of some warnings and unnecessary NSLog’s