TABundle: form and unused removal