Get home dir from env variable
Get rid of commented out code