cleanup for what works