Big cleanup

Enable kdoctools, remove patches that were upstreamed