Finally without the unnecessary files