Cleanup after #10