Code cleanup.
Removed unused "using" statements.
Removed unused, commented-out code.