Revert "Mockups"

This reverts commit cf47ea7d70b1e7af07a1dd7f6ec62a6c074482bd.