Resolved more "unused params"