Remove with_defaults decorator