cleaned up unused imports, updated maps to new map API