Removed all of the debugging statements and removed the testing specific code. This to make merging into the main tree easier.