usings cleanup