Fixed unused variables/parameters