Clean new mockup branch