Clean up Xcode warnings, remove unused drawRect boilerplate