Cleanup because of rename