Delete unused line
Remove duplicate file and update usings to point to version in mocks