Remove unecessary reflection hacks