Remove some warnings due to unused variables