Merge "Remove obsolete category links code"