Additonal cleanup