6.6: much cleanup