removed several things that are no longer needed