Removed unused maps