[UPDATE] removed some code that had been commented out and was not being used.