Removed drawAll function from Map and callers