remove trailing white space
feature which breaks entire app commented out

if the server_name is incorrect, it breaks the entire service
if it's missing, there's this annoying @None text which confuses users