remove map of cw
merge from the master