Remove duplicate entry in kitchen.yml, remove unused code for servers, formatting changes