PMO-2502: remove/replace todos with exception or resolve them