Sweeping changes to simplify for docker deploy