Version and hostname cleanup