Cleaning

Tidying after a massive filter and rebase.