Remove legacy object structure