more cleanupyay