removed lots of cruft