merge parxpc and cleanup