Remove uneccesary even filtering