clean up for next gen