Jbtis 287

Discovery cleanup for Luna