cleanup after comment from treww