Remove unused usings part two