Remove extra calls to env and creating the WORKSPACE variable