Does some more cleanup.

Signed-off-by: David LeGare <excaliburhissheath@gmail.com>