Change some strings and remove unused using statements