cleanup and move to another file