Remove redundant map