IDI-104: General clean-up