Some cleanup, added harproxy package