Cleanup & log-suppression