cleanup to jspart3.5.1 and jspart3.5.2