remove some dead code
update comment to reflect changes in the type class hierarchy