Fanchart - cleanup