IDI-104: More code clean-up