Remove deprecated code from form type extension