ISO8601

- Removed debugging code.
Code Cleanup

- Marked legacy items, formatting cleanup.