BUILDFIX: Delete unused variables