clean up based on upstream changes