Remove stuff that was not strictly necessary