Making everything current.
Clean up