Added ability to utilize the C drivers remove function.
Merge branch 'test'