cleanup
fix env