cleaning - see #1