remove dead code
clean up type class product/composition