Clean-up of everything pre-split