Revised remove site and write timeouts