Revert "new part and small fixes"

This reverts commit 48c12f6b9ab4efad7ce7918e715b6d3739c64fc5.