updated to SoftServer
cleanup