Fix a TODO to simplify build file