This is supported for other services. Unsure if it is used, though. I will remove for now. 

This might have to be removed in other places as well (if actually unused).