To Do clean up