removing some ITP specific stuff