type encoding support: cleanup