removed stupid optimizations