Cleanup+data path change