Removed useless Usings & code cleaup

Good stuff.