remove the old join map
remove dead codes