Webserver cleanup and uniformed, STS