Remove deprecated memoization code
Fix bad links