Shouldn't have gotten rid of the variables
Use environment variables if they're set