Adding env cleanup hook
Adding env cleanup hook
Cleanup fns need more work