Trying to fix what I done broke.
A bit more clean up.