Removing some custom Verold stuff that we don't need anymore