Minor optimization; use remove(..)

2 jobs for master in 38 minutes and 9 seconds