More Refactor ReflectionBuilder and removed dead code