Remove superfluous clean, full_clean, and save calls
Fix tests; fix cleaning order