working map and remove redundant files