going to only env for the moment
removing old cruft