Corrections and removing unwanted files