More clearing, cleaning and shuffling stuff around.