just cleaned up some unused vars....