Get rid of some crap

This gets rid of some junk. It also properly frees some previously unallocated items.