Removed D leftovers