vendor code cleanup