cleanup
a simplification