Remove legacy parts