Removed old simple map Implementation