Removed non-existent links, merged entries