Refactor: Clean-up mockup dataset