removed old vendor prefixes from fork

ATT, not meant for merge, but TODO note