cleaned up the unused vars