mariusl - directely from dash - cleanup