Remove deprecated form class