Clean up reflection code