Remove optimization for develop