diff --git a/curl-style.el b/curl-style.el
index b681a48c8f4948ae37127a99d3162c2e3d2d26c3..db47dd2d8d85a88b34e8e5a93f27eb4b776fffb3 100644
--- a/curl-style.el
+++ b/curl-style.el
@@ -37,15 +37,11 @@
   (setq tab-width 8
 	indent-tabs-mode nil		; Use spaces. Not tabs.
 	comment-column 40
-	c-font-lock-extra-types (append '("bool"))
+	c-font-lock-extra-types (append '("bool" "CURL" "CURLcode" "ssize_t"))
 	)
-  ;; We like auto-newline and hungry-delete
-  (c-toggle-auto-hungry-state 1)
   ;; keybindings for C, C++, and Objective-C.  We can put these in
   ;; c-mode-base-map because of inheritance ...
   (define-key c-mode-base-map "\M-q" 'c-fill-paragraph)
-  ;; Cleanups
-  (setq c-cleanup-list '(list-close-comma defun-close-semi empty-defun-braces brace-else-brace brace-elseif-brace scope-operator))
   (setq c-recognize-knr-p nil)
   )