some more cleaning up