Revert "Mockup2"

This reverts commit d1550613d0dd1ad00a4fd4ed9fbbce6960df895a.