refactor: revert overzealous cleanup