removed/commented out testing bits and pieces.