Finalize comments and remove test cases.