removed unnecessary mapping