More production fixes
Cleanup