cleaned up cleanup scripts