ZVISION: Remove dead code
ZVISION: Remove duplicate code