Teardown and server killer added