Some cleanup
handle supervisor for demo server