Revert "Update to 1.2 added rest of custom filter objects and cleaned up some code"

This reverts commit eb1682817d4168d39a77fe2a87e7cb39c5b76fb9.