cleanup after issue #1