viewer and dummy-client code cleanup