Remove username dependancy