Remove DS and some stuff