Cleanup

Environment cleanup