more 0C cleanup