restored some part of 39b2d3 that did not find its way into the pepc-svn, yet
some cleanup to f4a638