Removed hard-coded username