removing two unused vars