adapted license, remove some cruft