Got rid of use-case username