Remove cruft that is not appropriate for this fork