This made the cleanup pretty easy as well.