Do away with unnecessary uses of newWithDictionary, simplify api