Removing old mapping approach.