removing a few more pieces for minimal install