Further Removal of BBC

- This just further removes BBC and does some minor cleanup things.