Clean up repo to prepare for NR