Logging
Start a bit later, avoid NPEs etc
Logging
Don't remove from filter twice.