removed two unused vars