So many changes, lots of cleanup needed.