Selftest Charts - cleanup