Kill an unused function
Cleanup service command's tests

[#68475822]