remove deprecated links
merge changes