Removing old debug code.
removing code to be added as submodules.
Adding submodules.