Please review branch feature/rrd_cleanup