commented out unused code so far
removed overriden reflection code