Cleaned out the debug statements, ready to pass on to a higher level framework to test more completely