Removed some unused dependencies on Agency, adjusted map size