Added removal of servers/services, started basic testing + fixing syntax