Remove google map field, remove unnecessary options