Remove nao_common (replaced)