template removed.
test cleanup.
code cleanup.