Fix typo and remove usings