Removed user name. This shouldn't be hard coded