removed two unused variables