Remove a few things unnecessary now