took out some cruft