MOAR
Clean up for release