Remove some unused code, fix typo so BD works