Form handler class cleanup