fix cleanup and custom add all