SAG - Code cleanup, City and Map agents are created by default