More clean up.
No, honestly; will leave it alone now.