Revert "Service added like Willem want to :P"

This reverts commit 52580a918008e18b300ed40ba28afcf587f4cfce.