More cleanup app runs fine