fixing backup servers RT bug and partially cleaning code