Merge "Delete unused manifest file" into main