Removed unneeded map