Cleanup helper legacy code