Removed dependencies on bundled libraries