Remove extra stuff no longer needed