Revert "Revert "Revert "cleaning"""

This reverts commit 369a0ba8c2c98074ac8f3f206a6cc32622980021.
Revert "simplification"

This reverts commit 3eda1d17c96bbdc75c78d5d668ee4e1bc854590a.