Fix a couple minor bugs that refactoring introduced, and implement removing old/big...