As per discussion in #133 we will no longer be running DIND tests, so it will be good to cleanup the related code for maintainability.