haproxy flavor fix
cleanups on funny code