Cleaned up some unused vars.