removed ConstantType and associated cruft