Cleanup and immutability refactoring continues.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Removed unnecessary export.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>