Some files came back during merge, removed them again