BISERVER-8578 - localizing and other cleanup

BISERVER-8578 - localizing and other cleanup