DS clean work in progress

by Jan Milinovic