Some more removals
Updates after Seb's feedback