Remove a few things to get us booting for now. (WIP)

Change-Id: I8f11b332ebf30ca08ebcdb7d995b1d3e94385628