Removed ill-advised todo