Revert "core 1"

This reverts commit 4f635e05b7b4cfaad9d60db4902c1c2004db9f16.
Revert "second part"

This reverts commit 50aa9110b3abc3ef56169fce6d052102e8572e5c.