Removed some uses of reflection
Removed some more uses of reflection