Removing overrides not needed and adding a decorator to change video flags. refs #3757