some cleanup found some bad assertions neet