Remove some cruft...