Site encoder clean-up.