Cleaned up some things from my merge.