Remove / deprecate dead code
Use new RSpec syntax in example
Remove dead code
Refactor - tidy away filters