remove squishy-specific bits
clean up vhost definition, add security