Remove old declarations.
Clean up formatting.
Remove redundant logging.
Add a working simulator test.