Clean up cruft from refactoring