Attempting to clean up, but still a scratch code, contain random test
code and unused variable.