Removed kenyaui dependency and finished OCM-4