Added haproxy and cleaned up