Workqueue cleanups