[Core] Cleaning up for proper building of mangos-one.