Removed Filter closes #18