Remove deprecated form