Remobe unnecessary mapping