Changes to remove map for touch screens