Address code review feedback

Remove use of Windows
Use Item (NSDictionary) callback over Delete (id based) one
Take id in getVersion so check is explicit not implicit