Removing unneded map