Removed even more cruft