General cleanup - removing things that aren't needed.