Removed Retrieve() from the state since we will never output "state" from the State class.
Did some small cleanup, such as removing old typedefs.