Remove hardcoded username