Extra cruft gone