Undid some changes

Deleted EmbeddedForm class