removed kadoh dependency