Clean up OutOfDate codec
Remove out of date todos
Minor code cleanups.