added -f flag in cleanup