diff --git a/makefile b/makefile
index ab145b1..819244a 100644
--- a/makefile
+++ b/makefile
@@ -23,10 +23,10 @@ $(OBJDIR)/.pass0-iosevka-italic.ttf : $(FILES) $(OBJDIR)
 $(OBJDIR)/.pass0-iosevka-bolditalic.ttf : $(FILES) $(OBJDIR)
 	node generate bolditalic $@ --dumpmap $(OBJDIR)/iosevka-bolditalic.charmap
 
-$(STEP1) : $(OBJDIR)/.pass1-%.ttf : $(OBJDIR)/.pass0-%.ttf
-	fontforge -script pass1-cleanup.pe $< $@ $(SUPPRESS_ERRORS)
-$(STEP2) : $(OBJDIR)/.pass2-%.ttf : $(OBJDIR)/.pass1-%.ttf
-	fontforge -script pass2-simplify.pe $< $@ $(SUPPRESS_ERRORS)
+# $(STEP1) : $(OBJDIR)/.pass1-%.ttf : $(OBJDIR)/.pass0-%.ttf
+# 	fontforge -script pass1-cleanup.pe $< $@ $(SUPPRESS_ERRORS)
+$(STEP2) : $(OBJDIR)/.pass2-%.ttf : $(OBJDIR)/.pass0-%.ttf
+	fontforge -script pass2-cleanup.pe $< $@ $(SUPPRESS_ERRORS)
 $(TARGETS) : $(OBJDIR)/%.ttf : $(OBJDIR)/.pass2-%.ttf
 	ttfautohint $< $@
 
diff --git a/pass1-cleanup.pe b/pass2-cleanup.pe
similarity index 78%
rename from pass1-cleanup.pe
rename to pass2-cleanup.pe
index 8834164..c924527 100644
--- a/pass1-cleanup.pe
+++ b/pass2-cleanup.pe
@@ -17,6 +17,10 @@ RemoveOverlap();
 UnlinkReference();
 RemoveOverlap();
 ReplaceWithReference(4, 1);
+Print("Simplifying");
+AddExtrema();
+Simplify(0, 2);
+Print("Finalizing");
 CorrectDirection();
 CanonicalContours();
 CanonicalStart();
diff --git a/pass2-simplify.pe b/pass2-simplify.pe
deleted file mode 100644
index 34db2c0..0000000
--- a/pass2-simplify.pe
+++ /dev/null
@@ -1,19 +0,0 @@
-Print("Reading Font...")
-Open($1);
-SelectAll();
-ClearHints();
-ClearInstrs();
-ClearTable('fpgm');
-ClearTable('prep');
-ClearTable('cvt ');
-ClearTable('maxp');
-
-Print("Simplifying");
-AddExtrema();
-Simplify(0, 2);
-Print("Finalizing");
-CorrectDirection();
-CanonicalContours();
-CanonicalStart();
-Print("Saving ttf...");
-Generate($2);
\ No newline at end of file