Remove links support
Remove obsolete todo