remove mockup code