Optimization

undefined/unused read/write paths optimized.