More architecture cleanup
Still no effect on the output.