Try doing more cleanup in the hope of solving server issues