victor clean up code