Add success only cleanups