First get_rank() cleanup