Backup before some cleanup + some changes
Minor changes