Can you remove the commented out exception and the TODO above?