1. Remove unnecessary classes
2. add Null clause class
Merge branch 'master' of https://github.com/fastcatsearch/fastcatsearch.git