Backup Fix, Cleanup, Code Cleanup