Cleanup
Cleanup.
Start of the mockup.