Modified map and finally removed some files