cleaning up some lingering extra vars