Some cleanup
see #2