Response cleanups