Kozlov's headbutt finisher has got to go.
No. Absolutely not! At least not yet anyway. He can't abandon the Headbutt Of Death until he faces a Samoan. Super headbutting an unheadbuttable Samoan would cause a second big bang to occur between the heads of the two behemoths, creating a new universe where wrestling sucks slightly less.
Also, I agree with whoever said Santino should develop a submission finisher during which he could talk smack and crack jokes. It makes sense to find a way that he can incorporate more talking into his matches, considering it is his biggest strentgh.