Misc. cleanup
Fix whitespace
Remove GUI on slaves