Removed reduntant self.watch_for_quit