Some of the ivory cleanup work

Just wanted to get this out so the list of changes doesn't get too big