more housekeeping
cleanup