relicensing and cleaning up