Testing  and fixing

Uncommented and removing test code.  Going for live base