Review update: Fix spec; revert code deletion