Fine tune/cleanup of server start and restart logic