Address review comments and remove manifest.txt