deleted a lof of cruft