Clean-up before UDP implementation