removed testing junk - more clean up