removed even more cruft