Cleaning

Tidying up after a massive filter and rebase.