Remove dependency on proprietary code