Cleaning up for proper building of mangos-three