BaseForm: Cleanup the delegate stuff