Removed unnecessary column-value mapping