Super victor clean up

Do what lets you sleep at night.