Clean up
Allocation fix for production

Pushed live 2014-01-20