Started removing old KVObjects dependencies