fixed the overlap code and removed bad servlets