Depend to D::S::Simple for better diag
Removed unused code