hardening, cleanup