mariusl - cleanup