More clean up.
Continuing to attempt to clean up...