Cleaning

Dealing with consequences of massive filter and rebase.