Removed 2 unneeded maps