Cruft from refactoring?