cleaned up some stale variables