Removed some other cruft