Removed todo, and commented out offending code to be fixed later.