Cleanup commit, added diskless clients