Further optimizations to size
Removed experiment vestige