remove unecessary cascade
re organis
merge