add info and  cleanup