Removed cruft to focus on our bits.