Removed all Environment classes - Issue #26
More cleanups for Issue #25