Remove junks and readdress the files