Merge "Remove closure _unshelve_server not useful"