Removed reference to mapper that is not needed