Removed excessive redundancies

Environment is nice and squeaky clean <3