Merge "Remove strictIPs(), cascadingDeletes(), and cleanupTriggers()"