implement #75, also remove mapping for time being as broke