Removed bad calls that were breaking the build; be careful, Maps