Move option upgrade to upgrade hook.
Remove obsolete Items ACL modification.