Start cleaning up and get rcvgen working again.