angus clean environments

Breaking