Add workspace cleanups