Revert "Mockups initial"

This reverts commit 3570f02ddef45d12cc4a51743c3aa85896fe35eb.