more item related cleanup, starting to remove dependency on dataHandler (slowly)