Clean up, make it obvious which vendor made what.
Debug