Remove deprecated form type