Add delete forms and unrequire useless fields

Closes #40 and #44