cleaning up before new changes