removed some cruft