Did some more cleanup. This should still be moved into its own recipe and stripped for all unused stuff.