Tidy link service code
Remove superfluous cases from message handler