removing unnecessary mapping