logic cleanup, remove TODO