Removing stuff mostly, from D.