Removed strcpy calls