hmmph
lots of cleaning up
more cleaning up
more cleanup