Hopefully removed all _admin_opt references