Cleaning up: Removing the full-blown graph traversal.