Simplify structure - we do not need a production version