Make build pass - Reinstate deprecated valid usecases until valid
usecase exists