small update; removed some cruft