Cleanup; Adding 3.17