Revert last commit and add "unused" attribute to suppress warning