some things were removed