OPS-940 Removing useless defaults