Removed other cruft