Final bit of cleanup