remove duplication definitions of methods, remove unused code
remove duplication definitions of methods, remove unused code

fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary,fedora-conary/conary