Removal of lots of extra method definitions that didn't belong.