Clean up reduced encoding scheme