Removed unreferenced modules, fixed a minor complaint from the C++ compiler.