Removed unused introspection code (QueryDSL based).
Fixed some codestyle issues.
Removed some unused test code
Synch Sotera Upstream Master