Add clustercheck to cleanup