Misc cleanup
Removed SimpleResult.
Removed unused code.