Added cleanup on exit