minor code cleanup, removing some unused vars