Mvx INFR TODO's etc clean-up