Host vars cleanup

Remove files for hosts that don't exist anymore and rename files to be consistent with naming.