Usings cleanup