Vemove dependency on proprietary code