Remove reflection calls
Merge pull request #3 from jjcomer/fix-reflection

Remove (almost) all reflection calls