+ remove unused vars
+