removed username hard dependency