removes their memoization
fixes merge conflicts