Remove special casing for DefaultCreateOptions