more USE flag cleanup