We should add a comment to remind us to add these back if we're planning to. Also, when I fixed this in https://github.com/stephendonner/gaia/commit/2eaf0b2876c49241b6f84ac116a14d068c7469e0 I only needed to remove master and bt_sco.