Removed the MapCell and SearchCell