Removed unneeded code, added virtuals for consistency.
Compile fix.
Merge branch 'ethereumx' of https://github.com/ethereum/cpp-ethereum into ethereumx