TODO cleanup and new item