Remove unnecessary mapping