Cleanup; Explicit Bob dependencies