Removed unnecessary mapping