Updated cleanup

Now using the new deleteAllForQuery(query, asUser) method...