Remove hard-coded user name