More cleaning up & licensing