some more cleaning up.