Clean Environment

Remove the redundant Environment class