Cleaned up for new server or workstation use.
Cleaned up for new server or workstation use.