cleaned up unused vars