Remove test annotations - leftovers