I have been listening to lots of naats and nasheeds recently in place of my usual music and I've found that a lot of them contain the words Ya Rasoolallah Ya Habibullah Ya Mustafa etc. so I deleted these from my phone. As we are not supposed to call upon anyone other that Allah, is this shirk? I've now started to doubt some of my other naats which havent actually got those words in them but as they are partly in arabic I might not be understanding them right. And even the urdu ones are quite difficult to understand.
you did the right thing by deleting them.