Revert "Added vendor castrato"

This reverts commit e8a961f4a3b2f89b9ba3af073f118e9d5e321bf1.