Fix unused variable and comment warnings