cleanup and ready for v1r1p3