Cleaned up loose ends.