Fixed #8

Removed all references to filters. I'll create a separate branch to
reimplement them.