Comment by matthewking

Also looks like more than a few completely unnecessary using statements.