Comment 9 for bug 1210541

Finally, I have had time to look into this a bit. I was missing multiple direct pcrud searches for acpl's. One more forced update to that branch and now locations should no longer show up in any interface. Feeling much better about this one.