Remove USERNAME variable, simplifie PATH, change PATH, and misc cleaning