Environment cleanup and bug fixes
removing temporary debug output