Remove $revision.
Remove unnecessary check.
Add TODO as suggested by @mtbc.