Please review branch feature/rrdcleanup