add missing regions cleanup
remove unused members