Removed some cruft