Minor optimizations and tweaks
Rip out wrap code