Issue #4 - Remove more code related to filtering

Minor optimizations