Revert "MockUp"

This reverts commit 521eda63bed42e9b4dd886a144f5fecada7d9beb.