encoding: cleanup