dropped strict map, trying to clean up dependencies