Cleanup defines and static const NSStrings