cleaned up usings across the solution