Cleaned up more code. Moved GroupServer and FileServer key and list imports to separate methods for clarity. Added better fringe case handling when importing group and user lists. Lots of cleanup. Verified everything still works fine :)