Refactored the APIs to get rid of GPLv2 references