Removed unncessary map