cleaned up some old unused vars