Refactor and start clearing the usage of area master.