removed unrequired variables