legacy class removal