Cleanup (removed TODO items).