A bit of cleanup now that dev-master isn't in use