Revert "3 comit and remove"

This reverts commit 84acbdadcee116dc7fb389230080a720e44021e3.