encoder clean-ups