extra cruft taken out