Cleanup

for issue #888