Removing vendor dependencies