some cleanup. 26F 39E