Revert "[Updates] Update Makefile, areas, and data files"

This reverts commit 39217e2a3fc4ae40457873eccd93f39182b35f36.