removed a blocking TODO