Removing unnecessary compiler pass
Removing an annoying dependency