Remove the repoparse
Merged in changes