Clean up Backup classes
Tweak Backup classes