Remove some testing code
Updated to include draft support for ModelForms