Remove TODO that never applied
Better error handling in refresh()