Remove orphaned code and add argument rather than set value for testing.