Extraneous comments (TODOs) have been removed.