Getting rid of unnecessary folder