IDI-104: Code clean-up