Deleted some printouts and TODO's.