Revert "NAS_old && NAS.sql_old"

This reverts commit 402db0c40d41da976fd1839e0f2dd0be7caa1bf0.