ISPN-4871 Remove KeyValueFilterFactory and ConverterFactory to prevent
confusion

* Also removed additional imports
singletonstoretest separate branch