even more cleanup...

I know...