cleaned some usings and dependencies