Removed hardcoded usernames