Cleanup

Cleaned up some leftover changes from before the branch split.