Cleanup from the mango api and packaging changes