Header comments and removing unused arguments.